interpreters/berry: Normalize CRLF before patching#3567
Merged
xiaoxiang781216 merged 1 commit intoJun 30, 2026
Conversation
simbit18
requested review from
acassis,
jerpelea,
linguini1,
michallenc,
wangchdo and
xiaoxiang781216
Contributor
|
Hi @xiaoxiang781216, Is this related to any recent changes? |
Contributor
|
@xiaoxiang781216 there are two places where the old symbol still used: |
Contributor
here is the fix: #3568 |
Berry's downloaded default/berry.c uses CRLF line endings, while the local NuttX patch was LF. Fresh Linux and CMake builds failed when patch saw the line-ending mismatch. Regenerate the local Berry patch against the pinned upstream CRLF source and apply it directly in both Make and CMake fetch paths. This keeps the integration working until the Berry-side change is merged upstream and the pinned commit can be updated. Signed-off-by: Frederick Blais <fred_blais5@hotmail.com>
speccy88
force-pushed
the
codex/fix-berry-crlf-before-patch
branch
from
1218d36 to
30cdb19
Compare
xiaoxiang781216
approved these changes
Jun 30, 2026
acassis
approved these changes
Jun 30, 2026
Contributor
|
@speccy88 do you think this .patch could be submitted to Berry mainline later? I didn't dive on it, but seems like some NuttX structures are different from Linux/Unix, right? |
xiaoxiang781216
approved these changes
Jun 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Berry upstream stores
default/berry.cwith CRLF line endings, while the local NuttX patch is LF. Fresh Make and CMake builds can therefore fail before Berry is compiled because GNU patch rejects the hunks as line-ending mismatches.Normalize the downloaded Berry
default/berry.cbefore applying the existing NuttX patch in both Make and CMake fetch paths.Tested:
fix-crlf.py+patch -l -p1applies and updatesOS_NAME/optvalue../tools/configure.sh -a ../apps sim:berry && make olddefconfig && make -j8berry -vprintsBerry 1.1.0;berry -e print(40+2)prints42../tools/testbuild.sh -m -C -N -x -j 8 -a ../apps -t /tmp/nuttx_current_berry /tmp/berry-cmake-testlist.dattools/checkpatch.sh -c -u -m -g origin/master..HEAD/dev/cu.usbmodem101: flashedesp32c3-devkit:usbconsolewith Berry enabled;berry -vprintsBerry 1.1.0;berry -e print(40+2)prints42.Signed-off-by: Frederick Blais fred_blais5@hotmail.com